From 1d3cad675bddceb2cb1769fba27c304d7f57516e Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20H=C3=A4rdeman?= Date: Wed, 15 Oct 2025 17:58:10 +0200 Subject: [PATCH] luci-mod-network: organize "cache" tab in dhcp/dns views MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Delete the tab from dhcp.js, mark the options that belong to it in dns.js. Signed-off-by: David Härdeman --- .../luci-static/resources/view/network/dhcp.js | 12 ------------ .../htdocs/luci-static/resources/view/network/dns.js | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index a6cc96b934..1b4af65472 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -391,7 +391,6 @@ return view.extend({ s.tab('general', _('General')); - s.tab('cache', _('Cache')); s.tab('devices', _('Devices & Ports')); s.tab('dnsrecords', _('DNS Records')); s.tab('dnssecopt', _('DNSSEC')); @@ -420,17 +419,6 @@ return view.extend({ o.optional = true; // End general - o = s.taboption('cache', form.MultiValue, 'cache_rr', - _('Cache arbitrary RR'), _('By default, dnsmasq caches A, AAAA, CNAME and SRV DNS record types.') + '
' + - _('This option adds additional record types to the cache.')); - o.optional = true; - o.create = true; - o.multiple = true; - o.display_size = 5; - recordtypes.forEach(r => { - o.value(r); - }); - s.taboption('filteropts', form.Flag, 'domainneeded', _('Domain required'), _('Never forward DNS queries which lack dots or domain parts.') + '
' + diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js index b5bb26066c..61b09b84a6 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js @@ -456,6 +456,7 @@ return view.extend({ o.optional = true; // End general + // Begin cache o = s.taboption('cache', form.MultiValue, 'cache_rr', _('Cache arbitrary RR'), _('By default, dnsmasq caches A, AAAA, CNAME and SRV DNS record types.') + '
' + _('This option adds additional record types to the cache.')); @@ -466,6 +467,7 @@ return view.extend({ recordtypes.forEach(r => { o.value(r); }); + // End cache s.taboption('filteropts', form.Flag, 'domainneeded', _('Domain required'), -- 2.30.2